Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[cilium] Add support for choosing resources #11248

Merged
merged 2 commits into from
Apr 19, 2021
Merged

[cilium] Add support for choosing resources #11248

merged 2 commits into from
Apr 19, 2021

Conversation

dntosas
Copy link
Contributor

@dntosas dntosas commented Apr 17, 2021 •
edited
Loading

Cilium as a CNI is a critical component for the cluster so it would be safe
to have some guaranteed resources as well as allowing the users to
define them based on their needs.

In this commit, we init default requested resources and add the
capability of user-defined values.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 17, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @dntosas. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 17, 2021
@hakman
Copy link
Member

hakman commented Apr 17, 2021

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 17, 2021
@dntosas dntosas force-pushed the cilium-resources branch 3 times, most recently from a13ae2a to db3a3b1 Compare April 17, 2021 08:26
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 17, 2021
@dntosas dntosas force-pushed the cilium-resources branch 2 times, most recently from b58ff32 to 2edead1 Compare April 17, 2021 08:53
@dntosas
Copy link
Contributor Author

dntosas commented Apr 17, 2021

/retest

@dntosas dntosas changed the title [cilium] Add support for choosing resources WIP [cilium] Add support for choosing resources Apr 17, 2021
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 17, 2021
@dntosas dntosas force-pushed the cilium-resources branch 3 times, most recently from 533f3c7 to e3bcced Compare April 17, 2021 11:04
@dntosas
Copy link
Contributor Author

dntosas commented Apr 17, 2021

it seems we hit AWS limits again in test jobs like kubernetes/k8s.io#1921

@dntosas
Copy link
Contributor Author

dntosas commented Apr 17, 2021

/retest

@dntosas dntosas force-pushed the cilium-resources branch 2 times, most recently from a90c694 to 0f0404c Compare April 17, 2021 12:15
@dntosas dntosas changed the title WIP [cilium] Add support for choosing resources [cilium] Add support for choosing resources Apr 17, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 17, 2021
@dntosas dntosas force-pushed the cilium-resources branch 4 times, most recently from cf371ec to cd32964 Compare April 17, 2021 13:11
@dntosas
Copy link
Contributor Author

dntosas commented Apr 19, 2021

/retest

olemarkus
olemarkus requested changes Apr 19, 2021
View reviewed changes
docs/contributing/adding_a_feature.md
@@ -87,6 +87,8 @@ Then we conditionally move cilium-operator to masters:
{{ '{{ end }}' }}
```

After changing manifest files remember to run `bash hack/update-expected.sh` in order to get updated [manifestHash](https://github.com/kubernetes/kops/blob/master/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml#L74) values.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making this bit more clear. Note that not all manifests have tests that requires update-expected.

Perhaps split this to a dedicated commit?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

docs/networking/cilium.md Outdated
cilium:
cpuRequest: "25m"
memoryRequest: "128Mi"
cpuLimit: "100m"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setting limits on system pods is a bit risky. I'd rather not allow it. It is better that cilium consumes more memory than expected rather than that it OOMs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed limits ^^

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 19, 2021
@dntosas
[cilium] Add support for choosing resources
5552493 
Cilium as a CNI is a critical component for the cluster so it would be safe
to have some guaranteed resources as well as allowing the users to
define them based on their needs.

In this commit, we init default requested resources and add the
capability of user-defined values.

Signed-off-by: dntosas <ntosas@gmail.com>
@dntosas dntosas requested a review from olemarkus April 19, 2021 09:21
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 19, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 19, 2021
@k8s-ci-robot k8s-ci-robot merged commit 146f9b4 into kubernetes:master Apr 19, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Apr 19, 2021
@dntosas dntosas deleted the cilium-resources branch April 19, 2021 18:52
@dntosas dntosas mentioned this pull request Oct 7, 2022
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olemarkus olemarkus olemarkus approved these changes

@johngmyers johngmyers Awaiting requested review from johngmyers

Assignees

@olemarkus olemarkus

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons area/api area/documentation cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.
4 participants
@dntosas @k8s-ci-robot @hakman @olemarkus